release 0.1.42

diff --git a/NEWS b/NEWS
index 253def86bab8d6a20f69365749f7e9c8611245c7..2e154e9b5d6c82dac5fa0176094a31cf3ba99f5d 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,9 @@ the news section both in the README and the webpage.
                                                                           -->
 
 
+2018-01-23 babl-0.1.42                                              </dt><dd>
+Fully initialize fishes when loading from cache. <br/>
+                                                                    </dd><dt>
 2018-01-16 babl-0.1.40                                              </dt><dd>
 Added format "CIE XYZ alpha" color model and formats.
 New API babl_process_rows for reduced overhead in some scenarios; though bigger

diff --git a/babl/babl-space.c b/babl/babl-space.c
index 781e41997461e17875320ab45953007a7dbc3ee0..6794c2c14ee399b810776cf609137e9d39bc703c 100644 (file)
--- a/babl/babl-space.c
+++ b/babl/babl-space.c
@@ -575,7 +575,7 @@ static void prep_conversion (const Babl *babl)
 
 
 static inline void
-universal_nonlinear_rgb_converter (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples)
+universal_nonlinear_rgba_converter (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples)
 {
   const Babl *source_space = babl_conversion_get_source_space (conversion);
   const Babl *destination_space = babl_conversion_get_destination_space (conversion);
@@ -681,6 +681,7 @@ universal_nonlinear_rgb_u8_converter (const Babl *conversion,unsigned char *src_
     rgba_out[i*4+0]=in_trc_lut[rgb_in_u8[i*3+0]];
     rgba_out[i*4+1]=in_trc_lut[rgb_in_u8[i*3+1]];
     rgba_out[i*4+2]=in_trc_lut[rgb_in_u8[i*3+2]];
+    rgba_out[i*4+3]=rgb_in_u8[i*3+2] * 255.5f;
   }
 
   babl_matrix_mul_vectorff_buf4 (matrixf, rgba_out, rgba_out, samples);
@@ -730,7 +731,7 @@ static inline void babl_matrix_mul_vectorff_buf4_sse2 (const float *mat,
 
 
 static inline void
-universal_nonlinear_rgb_converter_sse2 (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples)
+universal_nonlinear_rgba_converter_sse2 (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples)
 {
   const Babl *source_space = babl_conversion_get_source_space (conversion);
   const Babl *destination_space = babl_conversion_get_destination_space (conversion);
@@ -862,11 +863,11 @@ add_rgb_adapter (Babl *babl,
                        NULL));
        prep_conversion(babl_conversion_new(babl_format_with_space("R'G'B'A float", space),
                        babl_format_with_space("R'G'B'A float", babl),
-                       "linear", universal_nonlinear_rgb_converter_sse2,
+                       "linear", universal_nonlinear_rgba_converter_sse2,
                        NULL));
        prep_conversion(babl_conversion_new(babl_format_with_space("R'G'B'A float", babl),
                        babl_format_with_space("R'G'B'A float", space),
-                       "linear", universal_nonlinear_rgb_converter_sse2,
+                       "linear", universal_nonlinear_rgba_converter_sse2,
                        NULL));
        prep_conversion(babl_conversion_new(babl_format_with_space("R'G'B'A u8", space),
                        babl_format_with_space("R'G'B'A u8", babl),
@@ -899,11 +900,11 @@ add_rgb_adapter (Babl *babl,
                        NULL));
        prep_conversion(babl_conversion_new(babl_format_with_space("R'G'B'A float", space),
                        babl_format_with_space("R'G'B'A float", babl),
-                       "linear", universal_nonlinear_rgb_converter,
+                       "linear", universal_nonlinear_rgba_converter,
                        NULL));
        prep_conversion(babl_conversion_new(babl_format_with_space("R'G'B'A float", babl),
                        babl_format_with_space("R'G'B'A float", space),
-                       "linear", universal_nonlinear_rgb_converter,
+                       "linear", universal_nonlinear_rgba_converter,
                        NULL));
        prep_conversion(babl_conversion_new(babl_format_with_space("R'G'B'A u8", space),
                        babl_format_with_space("R'G'B'A u8", babl),

diff --git a/configure.ac b/configure.ac
index 7c81c6b71befa498057eba74ff4c5ca7eec594e4..7499762a578c684b8f575416f01cfae6be076489 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -14,7 +14,7 @@ AC_PREREQ(2.54)
 
 m4_define([babl_major_version], [0])
 m4_define([babl_minor_version], [1])
-m4_define([babl_micro_version], [41])
+m4_define([babl_micro_version], [42])
 m4_define([babl_real_version],
           [babl_major_version.babl_minor_version.babl_micro_version])
 m4_define([babl_version], [babl_real_version])

diff --git a/meson.build b/meson.build
index bfd4ae45a032caa9fb2900bed128f012ffc83543..d18db0a659fb52acc99aff74c44ca8fdfea09b70 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1,6 +1,6 @@
 project('babl', 'c',
   license: 'LGPL3+',
-  version: '0.1.41',
+  version: '0.1.42,
   meson_version: '>=0.40.0',
   default_options: [
     'sysconfdir=/etc',